Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 24 Jan 2010 21:58:18 +0000 (21:58 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 24 Jan 2010 21:58:18 +0000 (21:58 +0000)
commit6484b72af610891795122951f8e23160aa28bdb0
treeb546a46016a9b87535a0035c2157188f8a738310
parentf96bdc55a873e4019f256261cd4a870ed209426c
parentcabf561c16b09eed145efefaf1dbd8c08854cd90
Merge from mainline.